Merge "Fixed bug with task record not updating to fullscreen sometimes"