Merge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted.""