Merge "Wait for animation complete before completing boot" into lmp-dev