Merge "LivePreview: Prevent unnecessary DOM change for spinner"