Merge "Skip app widget config changes when user locked." into nyc-dev