Merge "Fix up some jank from unnecessary reinflation" into oc-dev
am: f6e2099063

Change-Id: I32bbb4c1bbe5a477565ceb0382cc859c53283fdf