Merge \\"Reduce ImageSpace::Init frame size\\" am: edbcf54199
am: e28954d0d0

Change-Id: I735eb3ba8642d28aa5d851fa6071cd3f2d7c5e0b