Merge "Make adb shell am display-size persistent." into honeycomb-mr2