Merge "Prevent home task from being set as ontopofhome"