GitLab

by trial and error adjusted the bottom margins of the controls to make
transition to real camera layout seamless on the HH and N4.

Bug: 11236276
Change-Id: I707a5b0b94ac466c07b19c84473e444250cecf28