Merge "Add back support for force resize developer option." into oc-mr1-dev