Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev am: 4f63bb6 am: 9359e0f
am: ff380b9
* commit 'ff380b9841f9ee3caff08e7a23fdbceaea0ec9a8':
Change-Id: I1221ee54c4fc1838275cf021cce054cd9513d94e
This commit is contained in: