Merge "OPP: Notification position is changing"