Merge "Inflate necessary previews upon user interaction instead of inflating...

Merge "Inflate necessary previews upon user interaction instead of inflating everything on creation of the screen. This will improve the speed of opening the screen and refreshing screen upon commiting change." into nyc-mr1-dev