Merge "Hide multi user switcher on keyguard screen when disabled" into tm-dev