Track SuperUser and Widgets jb-mr2

Change-Id: I8bbadfc61137d05e994e02bbb990a1287fcfcf0f