Merge "Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps" into jb-mr2-dev