Merge "Enable transitions in lockscreen media controller" into klp-dev