Merge "Hide notifications when in Lockdown mode" into pi-dev