am 9d67ffda: am c50dbb00: Merge "OPP: Notification position is changing"

* commit '9d67ffdac68b49cfc72491f7e2c340df922dbcca':
  OPP: Notification position is changing