Merge changes I14c90b6a,I7850a556

* changes:
  Reset configuration of invisible size-compat activity if display changes
  Don't involve decor inset into app bounds of fixed aspect ratio app