Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev