Merge "Fix bug 6330745 - internal fix for spinners"