Merge "Shared notification container - Update isLockscreen" into main