Merge "DO NOT MERGE Fix back button state issue" into ics-scoop