Merge commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b' * commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b': Fix back button handling in ACTV
Merge commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b' * commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b': Fix back button handling in ACTV