Merge "DO NOT MERGE Return the preferred home activity first to honor persistent preferred activity." into tm-qpr-dev