Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev
am: 331a287656

Change-Id: Ie00665beb58cfb797cfdc85c20adfb28988055b2