Merge changes I2af07b57,Ic0a774e8,Ica3d21ff,Id4c3c901

* changes:
  FalsingManager Quick settings fix
  Fixed a bug where the panel could be too small in certain cases
  Fixed a bug where the margins where not updated correctly
  Fixed the handling of the expand on the lockscreen