Clean up debug flags and add more screen record

Bug: 193440212
Bug: 194484556
Test: manual
Change-Id: I1b09ae74462c86afb8effb0a2635fd0e70a59bf8
4 files changed