1. Upload screenshots
2. Fix issues

Change-Id: Idd2a65ace919543881e4431a94bb578989696f18
Merge "1. Upload screenshots 2. Fix issues"