Merge "Fix notification bounds on screen" into mnc-dev