Merge "AOD: Refine ambient notification view"