Protected Apps: Show state by component instead of by app

Change-Id: Idbe1d69b376fc3f42980404d9448152f606e7f8e