Merge "Fix issue where bottom scrim appears in homescreen when it shouldn't" into tm-qpr-dev