Card layout tweaks; Fix AOKP changelog showing AICP changes

Update TODO list

Change-Id: Ib7d0b1d88705ebd394e6ab9253d9e0f469530295