Merge "Force lock icon animations on UI thread" into nyc-mr1-dev