Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev