Merge "Changing the order where getBootDisplayModeSupport is called" into tm-dev