Merge "Fix error color states and alphas and sizes of lock screen icons" into oc-dr1-dev