Merge "Fixed a bug where the notifications would jump when going to the full shade" into mnc-dev