Merge "Ensure to resume home if there is no other activity" into qt-dev