Merge "Make sure mClearAll is true after calling GetNaturalSize()" into devel/master