Merge commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c' * commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c': don't layout when setting size from zoom if only height changed
Merge commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c' * commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c': don't layout when setting size from zoom if only height changed