Card layout tweaks; Fix AOKP changelog showing AICP changes

Change-Id: If85bd7311ee19222b7e6de3b80840446c67971e1