Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2