Merge "Hardcode ActionBar height to avoid changes while emulating" into main