Merge "Fix incorrect behavior of back button in kids mode" into tm-qpr-dev