Merge "Require screen to be unlocked for smart replies" into pi-dev