Merge "Fix adb am display-size." into jb-mr1-dev