Merge "Fix affordance in lockscreen and dream" into tm-qpr-dev