Merge "Merge "Add back support for force resize developer option." into oc-mr1-dev am: 23b7a8ad am: 1313bf7a"