Merge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev