Merge "Whitelisting Launcher3 for hidden APIs" into pi-dev