Merge "Fix cast dialog dismiss on home/recents" into oc-dev