Merge "Revert ENABLE_PREDICTION_DISMISS and ENABLE_HYBRID_HOTSEAT flags to use DeviceFlag" into ub-launcher3-master