Merge "Avoid hotseat edu button overlapping" into ub-launcher3-rvc-dev