Merge "Update javadoc for FORCE_RESIZE_APP" into sc-dev