Merge "Fixed a bug with notification clipping" into lmp-mr1-dev