Merge "Suppressing FUL after user switch (fix b/7316467)" into jb-mr1-dev