Merge "Merge "Always send configuration changes to activity." into nyc-dev am: 988a20a am: 3e92aba" into nyc-mr1-dev-plus-aosp