Merge "Fixed an issue where the roundness of a notification could be wrong" into pi-dev am: 65cb06cfc5
am: 00882302a1

Change-Id: I2fc235fb0e547518b90d321a47a9d96cb7b4ab99