Merge "Fix settings drawer when font size is huge am: 8095309 am: 02b0a8f" into nyc-mr1-dev-plus-aosp
am: 00a39a2

* commit '00a39a222f5ab824ac5f2eccc10ddae7bf78dd13':

Change-Id: I16197f15c7a1febf43330ce295db9957663aaea8