Merge "Correct one error in the last checkin. Removed ActionBar instead of Swipe-to-dismiss." into klp-modular-dev