Merge "Fix predictive back not working for screen cast dialog from lockscreen" into main