Merge "Remove card stack" into mnc-dev