Revert "Revert "[3.0] Temporary change to fix homescreen issue""