Merge \"Force lock icon animations on UI thread\" into nyc-mr1-dev
am: 2d7d1209de

Change-Id: I4cc897a7a77a167b20837669e8254e720b785969