am 78e3b09b: am f283eae0: Merge "Avoid NPE when Screensaver configuration...
am 78e3b09b: am f283eae0: Merge "Avoid NPE when Screensaver configuration changes" into ub-deskclock-business
* commit '78e3b09b':
Avoid NPE when Screensaver configuration changes