Merge "Ensure activity visiblity when moving task" into mnc-dev