Merge "Solved notification overlay issue once and for all" into lmp-mr1-dev