Merge "Do not modify notification shade plugin state." into main