Merge "Fixed an issue with back key behavior" into mnc-dev