Merge commit 'fb2fbefd6fa3b6503522dc24214295122c3d4f31' * commit 'fb2fbefd6fa3b6503522dc24214295122c3d4f31': Address the multiple resizing during initializing
Merge commit 'fb2fbefd6fa3b6503522dc24214295122c3d4f31' * commit 'fb2fbefd6fa3b6503522dc24214295122c3d4f31': Address the multiple resizing during initializing