Refactor and update screenshots

Change-Id: I3e853649e4bd534e48a223d4eae73213a55ef6e2
Closes-Bug: 1286105
Merge "Refactor and update screenshots"