Added fixed control heights to avoid scaling issues in non adopted OSDs (TV)
Merge remote-tracking branch 'origin/FEAT_ApolloOne' into Weekly