Merge "Remove @Nullable annotation for onConfigurationChanged." into tm-qpr-dev