Merge "Set mActualScale when initialScale is set."