Merge "reduce flunctuation in boot animation start / stopping time" into oc-dev