Merge branch 'master' into wip_leon_T7643_login_page_text_focus