Merge changes Idd092c44,I85f7686e

* changes:
  Indication area alignment in AOD
  Fix alignment of ambient notificaiton