Merge changes I452376eb,Ib864a279

* changes:
  [RESTRICT AUTOMERGE] Support lifecycle CTS on non-fullscreen display
  [RESTRICT AUTOMERGE] Do not enforce minimized dock feature to all devices